printer: Make private

We want to subclass this in print backends,
but we don't want to allow out-of-tree subclassing.

diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h
index b8bd1eb4848191e07a849ff35a85117ece785098..fac90fa74c75afe79e29861b1817a6d49ec10250 100644 (file)
--- a/gtk/gtkprinter.h
+++ b/gtk/gtkprinter.h
@@ -73,43 +73,10 @@ GType gtk_print_capabilities_get_type (void) G_GNUC_CONST;
 
 #define GTK_TYPE_PRINTER                  (gtk_printer_get_type ())
 #define GTK_PRINTER(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINTER, GtkPrinter))
-#define GTK_PRINTER_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINTER, GtkPrinterClass))
 #define GTK_IS_PRINTER(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINTER))
-#define GTK_IS_PRINTER_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINTER))
-#define GTK_PRINTER_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINTER, GtkPrinterClass))
 
-typedef struct _GtkPrinter          GtkPrinter;
-typedef struct _GtkPrinterClass     GtkPrinterClass;
-typedef struct _GtkPrinterPrivate   GtkPrinterPrivate;
-typedef struct _GtkPrintBackend     GtkPrintBackend;
-
-struct _GtkPrintBackend;
-
-struct _GtkPrinter
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GtkPrinterPrivate *priv;
-};
-
-struct _GtkPrinterClass
-{
-  GObjectClass parent_class;
-
-  void (*details_acquired) (GtkPrinter *printer,
-                            gboolean    success);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-  void (*_gtk_reserved8) (void);
-};
+typedef struct _GtkPrinter      GtkPrinter;
+typedef struct _GtkPrintBackend GtkPrintBackend;
 
 GDK_AVAILABLE_IN_ALL
 GType                    gtk_printer_get_type              (void) G_GNUC_CONST;

diff --git a/gtk/gtkprinterprivate.h b/gtk/gtkprinterprivate.h
index 51ec1a861f73053c7f2f98813e6d570fad9cc4c2..fef161cdbff6d8e462936e957c5fd0b3dee52415 100644 (file)
--- a/gtk/gtkprinterprivate.h
+++ b/gtk/gtkprinterprivate.h
@@ -25,6 +25,28 @@
 
 G_BEGIN_DECLS
 
+#define GTK_PRINTER_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINTER, GtkPrinterClass))
+#define GTK_IS_PRINTER_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINTER))
+#define GTK_PRINTER_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINTER, GtkPrinterClass))
+
+typedef struct _GtkPrinterClass     GtkPrinterClass;
+typedef struct _GtkPrinterPrivate   GtkPrinterPrivate;
+
+struct _GtkPrinter
+{
+  GObject parent_instance;
+
+  GtkPrinterPrivate *priv;
+};
+
+struct _GtkPrinterClass
+{
+  GObjectClass parent_class;
+
+  void (*details_acquired) (GtkPrinter *printer,
+                            gboolean    success);
+};
+
 GtkPrinterOptionSet *_gtk_printer_get_options               (GtkPrinter          *printer,
                                                             GtkPrintSettings    *settings,
                                                             GtkPageSetup        *page_setup,